Fix potential merge conflict