init : Fix missmerge stuff