better handling of merge conflicts