Remove extra quotes / newlines from server side.
Fix merge conflicts.