[fixed] some more missed merge stuff