Ammending merge conflicts.