small changes
resolving merge conflicts
... what is being presented