merge bug_fixing