Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request.