Merged code base after merge conflict in SyncAdapter