commit changes before merge

commit changes before merge