hi, are you planning to merge the changes soon?