before pull
solve conflict
change xls files