Fix failed git merge.