second modified .txt
without conflicts