Fix merge job