Fix bugs with Y0 in flshinc files
Conflict in CHANGES