Added note on conflicts