merge the change by the last commit