Added check in conflicted? for when a conflict has been resolved