fixed failed merges