Merge remote-tracking branch 'origin/master'

# Conflicts:
#	package.json

docs/reference/basic/clear-screen.md

@@ -6,9 +6,9 @@ Turn off all the LED lights on the [LED screen](/device/screen).
 basic.clearScreen()
 ```
 
-### Example: vanishing heart
+### Example: Vanishing heart
 
-The following code shows a heart on the screen and then turns off all the LED lights using `clear screen`:
+The following code shows a heart on the screen and then turns off all the LED lights.
 
 ```blocks
 basic.showLeds(`
@@ -23,5 +23,5 @@ basic.clearScreen()
 
 ### See also
 
-[set brightness](/reference/led/set-brightness), [unplot](/reference/led/unplot), [plot](/reference/led/plot), [Image](/reference/images/image), [clear](/reference/basic/clear-screen)
+[set brightness](/reference/led/set-brightness), [unplot](/reference/led/unplot), [plot](/reference/led/plot), [Image](/reference/images/image)
 

package.json

@@ -1,6 +1,10 @@
 {
   "name": "pxt-microbit",
+<<<<<<< HEAD
   "version": "0.2.166",
+=======
+  "version": "0.2.168",
+>>>>>>> origin/master
   "description": "BBC micro:bit target for PXT",
   "keywords": [
     "JavaScript",
@@ -29,6 +33,6 @@
     "typescript": "^1.8.7"
   },
   "dependencies": {
-    "pxt-core": "0.2.179"
+    "pxt-core": "0.2.180"
   }
 }