icemaple real merge with corect time