restore some conflicted codes