readme updated by cory
fix merge conflict