Add Job to check for merge conflicts

[tcavaletto]

Before submitting an enhancement request, please check the existing issues to see if the feature you want has already been requested. If so, please add a comment or thumbs up so that we can see the level of community interest in it!