Adding jovel.txt
Resolving conflicts