Merge conflicts resolved