Fixed a merge conflict in Level 1