commit a conflict line by Makrwu
solve conflicts