Changed readme to test conflicts