remerged one.txt