committed txt file
fixed conflicts