Drop the 'Conflicts Resolved' line from commit template

Git adds that line automatically if there were conflicts