fixed merging error (wrong datatype for free)