Merge actually merges. Reverting