just do basic merges