Fixed merge

Fixed source file generation that wasn’t merged properly