Cleanup conflicts in tex files