Deleting memoria.md
Solving conflicts