Merge conflict in manifest