merge backmask commits