remove ConflictError
1 file changed