removed old bug
fixed merge conflict