this is my conflict test
merged readme