commit before pull
solve conflict