first commit
change readme file
resolve merge conflict on readme file