The merge issues are real.
Fixing merge issues one commit at a time.