return everything as a JSON with message
resolved merge conflicts