Merge conflict actually fixing.