added gson
reslove conflicts