finally fixed the merge god...