Adjusted for checkout conflict, then merge conflict, then another