@(hasConflict: Boolean) @if(hasConflict){
Don't worry, you can still submit the pull request.
These branches can be automatically merged.