changes and things
trying to fix merge conflict