inaya repo. merge