In order for frontend to display appropriate message when a file
has a conflict, they need to know which type of conflict has
occurred.

This adds the `conflict_type` property which can be the following:
- both_modified
- modified_source_removed_target
- modified_target_removed_source
- renamed_same_file
- removed_source_renamed_target
- removed_target_renamed_source
- both_added