Merge error: Mutations not correctly added to commit