accept the changes from master