made merge behave properly