updated conflicted stuff