Added option for auto-accept, undid most of manual merge