test1 local2
conflit resolved