merging layout into master