bootsrap setup

bootstrap setup
resolve conflicts