editeed release notes
fixed conflicts in JIIC release notes