merges new gaa template from dev