branch-1.0: short text from branch-1.0 with conflict but ignore whitespace
branch-1.0: short text from branch-1.0 with conflict but ignore whitespace

aoancea/tutorial-material-design,aoancea/tutorial-material-design,aoancea/tutorial-material-design