1. "Find out how" under "Switch from REST" on your homepage is not working.

2. Is there a way to disable auto resolving of conflicts? i.e to let the user know of the conflict?