Fix failed merges