added potential conflict