conflicting changes to  work1