made some changes
merge conflict fix