Handle update conflicts in REST service by sending HTTP 409 on conflict
Implement conflict handling in android client
Clear notification after resolving conflict