Fixed Merge conflicts in generator