Fix merge confilct