before another pull
git merges fixed
finally mergefixes