Fix merge conflics