changes added
conflit resolved