rewrote merge