Updated readme
Conflist resolution