update readme to test conflic