modified readme to force conflict