move my version of jade over to master