added conflicts checking