fixed layout file
fixed merge