Typo fixes to conflicts.md
Typo fixes to conflicts.md

akhilesh0707/sync-android,nuan-nuan/sync-android,nuan-nuan/sync-android,akhilesh0707/sync-android,cloudant/sync-android,nuan-nuan/sync-android,cloudant/sync-android,akhilesh0707/sync-android