Remove extra line in composer.json that was causing weird errors in my checkout.
Merge branch 'master' of github.com:camdram/camdram
Fixed composer.lock merge again...