fix json export
merge with master remote