create readme
resolve merge conflicts