Fixed resolution issues for the hunger bar
fix conflicts