Changed README to include conflict notes