CSPACE-5678-D: Fixing merge problem.