Merging by rebase. Thanks