removing exact string match
resolving merge conflicts