minor changes
resolving merge conflicts