resolved conflicts

diff --cc keyboards/dz60/keymaps/billiams/readme.md
index a5ecb71,5a3a721..32d39be
--- 1/keyboards/dz60/keymaps/billiams/readme.md
--- 2/keyboards/dz60/keymaps/billiams/readme.md
+++ b/keyboards/dz60/keymaps/billiams/readme.md
@@@ -11,8 -11,9 +11,7 @@@ Settings
  * `/ ?` are available when you tap the right shift. Otherwise RShift is shift when held down
  * RESET is available as `Fn`+ ` ESC`
  * Underglow toggle and mode selection are available as `Fn` + `Q` and `Fn` + `S`. Yes your keyboard has lights even if you didn't get the LEDs. Bonus!
 -* Media play/pause doesn't seem to work with anything but iTunes at the moment. FML
 -
  
- 
  ### Initial Installation
  
  I found the instructions to be longer than they had to be, and I ended up having to Google some steps anyway. These are the steps I took to get my keyboard setup, in case you are new to the process.