0.2.2 - bug fix for resolving a conflict using hashmaps