deleted everything and switched to master