Fix Error with Conflictresolver not properly resolving conflicts
Merge branch 'master' of github.com:oharaandrew314/TinkerTime