merge now doesn't suck