Fixed typos in layer.conf
resolved merge conflict