Fix the rest of conflicts