Fixing some sort of merge problem with Yoshi game commit. Files getting unmodified
more fixes