fix extraneous merge issues