Fixing merge conflicts (for real this time)