save progress
resolve superficial merge conflicts