merge and rebased