Resolvendo merge
Merge de disciplinas.txt resolvido.