implemented basic movement
solved merge