Fixed failed merges