Get rid of \n and whitespaces in json output
Resolve conflicts