Conflict solved
conflict
Solved master conflict
README updated