Merge conflicts again