Respuestas al mensaje #1,910

Rebasing through terminal works in the meantime anyways. As long as you don't have the conflict on the map files it's fine, just fix the conflicts...