Have tried merging and rebasing, absolutely wonderful!