fixed error caused by merge