fix a load of merge problems
show confirmation once offer is made, hide offer button