Fixing merge conflicts again