Reconciled conflicts in readme