Fix Calories column in exercises
Fix merge conflicts