removed unused files
merge fixed