merge, alot of ditch and redoing