Commit conflicts checking with Gerrithub code review
Commit conflicts checking with Gerrithub code review

Change-Id: If88be89619a5e927a615757cff03a018aea5d250

sunil4infobeans/demowork,sunil4infobeans/demowork