my changes dont do anything
merged conflicts
does not print forever now