fixes all the merges