some mistakes in rules fixed
conflict solved