adds stuff
Resolves merge conflict