modified readme to create a conflict