i think i have it merged?