Merge conflict in master layout view