Update checkcommit.xml

Conflict commit