my copy
conflit resolved