Fix a Github merge bug