Fix conflict
fixing coflict, cleaning up repo