fix merge
fix conflicts
ajax get to json