updated most files
fixed conflict