Comment by danielvaughn

You had me at automatic conflict resolution. Definitely going to be trying this out, this looks amazing.