corrected merge portion of fix()