Fixed the merge fail