When conflict occurs and it's resolved on client or server the applied data is not added to cache. This is happening due to the fact that we do not eat up error or pass the data back to the cache layer (we always do forward but we should also do "backward"

Hopefully with this trivial fix we will be able to see resolved conflicts in UI