made some changes
fixed a merge conflict