Modified text file
Modified text file confliction resolved