add constraint propagation & constraint decomposition, up to 60 queens
clean stuff
conflict merge