merge conflits