fixing typo
resolving merge conflict