Fix the merge bug