jsonfavstops added
merge conflict fixed