local - remote conflict test 2
ivan txt conflict