fixed broken merges