Merge feature tmp/stop.txt