A ton of good work
resolving conflicts