merges trevorgunn manually