rebond framework design refactoring
solve conflict on amend