Ash master merge