changed keys back to dev after merging