Resolving merge conflict pointed by @Matt