Fixing Merge Conflict. Added Opening Cliff.