updated the setup
solved merge