fix errors when merging with develop ver2