Updated conflicted variables