updated merges