Fix conflicit detection