resolving left out merges