resolve conflicts between local copy and previous commit