i didn't merge right?