removed serialisation errors
fixed merge conflicts