Resolved conflicts in readme