conflict handling moved to other template file
Merge remote-tracking branch 'origin/master'