removed comments,puts and modified some code
removed conflict