fix merge again (current/previous/next version issue)