Modified cosa.txt
Solved conflict.