changes to work1 that conflict with master