Added some stuff
Fixed merge conflict