helps if you resolve conflicts