What my engineer means when she says: "I can't ship the feature on time because of merge conflicts, I need to fix them first."