fixx merge issues