updated merge issues