clean up changes
fixed merge conflict