Apps with 'Conflict resolver' feature