merge issues fixes