master first after merge