to merge and fix conflicts