misc
fixing merge issues