small changes
resolving merge conflict