Fixing merge issues Git never thought to tell me about.