templates / branches--on commit conflict-marker-size: new attribute (23a64c9)
   1: this is just to ensure the directory exists.