Fix the merge job