updated conflicted readme