Fix committed merge conflict