fix 349

- if there is a conflict while updating, get latest revision from db instead of cache