Resolved merge conflict by checking out file from app_dev branch and adding it to the master
602a617
mkutarna
commited on