some change forget to commit
fixed merge issue caused by forget to commit