Change done exclusively to generate a merge conflict
Resolución deconflicto