core: partially removed nonce parallelisation and added merge error chk

Invalid forks are now detected

Current setup of parellelisation actually inserts bad blocks. This fix
is tmp until a better one is found