End levels
Fixing merge conflicts