Fix merge conflits