Fixed a merge bug