Update readme to create merge conflict