fixes #2
conflict resolution