made some changes
fixed merge conflict