cleanup
fixed merge conflict