fixing merge conflict
resolving merge conflict