Fixed merging! Again.