Manually fixing merges gone bad.