fixed error caused to make merge work