Conflicts resolved after merge