Add support for 'conflict' parameter to allow control over behaviour if conflicts exist