Fixed merge error on layout file