think i sorted out alot of the merging problems, i think