commit all has finished files
fixed conflict