Imagegit and bootstrap
fixing merge conflict