removed some unneeded files
fixed conflict