Fixed Conflicted