resolved merge conflict in layout file