comit abc.txt
resolved conflicts