resolve problems introduced by resolving of merge conflicts