Resolve diff with copy_point