Resolve merge conflict with default layout