fixing wrong merges