Add readme file
Resolve merge conflict