michaels readme
Conflict resolved