fixed the merging stuff i hope.