test to git
solving merge conflicts
adding separator in tareas activity