package-template: another failed merge: __init__