cleanup of merge conflicts