adding copy paste
merge conflict fix
commented out too much