Fix conflict details view

TODO: add 'updated_at' field