removing merged conflicts