Stable. 2.4_01. removed the merging errors.

this is now at version 2.4_01.