Master and dev are now equal