fixes bug in bootstrap client + merge error