commit with conflict
removed conflict