add contributions and conflict to plow