removed all files
fixed merge problems