removed old code
fixed conflict