Fixed bug caused by merge conflict