Fix my self made merge conflict