deleted some code
fixed merge conflicts