Commit by Srini
After resolving conflicts