remove git conflict and solve missing end tag on span
renamed and everthing works