I agree with ZLima12. Next time, please try doing smaller and more targeted edits. When conflicts arise, that's a clear sign that too much has been changed at once and those warnings should not be ignored.