removed conflict counter, added conflict duplicate safeguard
undid everything, magically working
Bug fix. Removed conflict counter again, now works w/o it
removed debug code
Merge pull request #1 from zleman1593/final-bug-hunt

Final bug hunt