have working merge now