tidying up removed files
fix conflicts