use master after merge