merge conflict fix
test stuff and delete stuff