fixed 466haskKey bug
updated firing times
Merge pull request #280 from CyberCRI/patch-conflict

Added patch conflict detecting functions