Added branch clobber and abandon actions on conflict
Cleaned up some leftovers