Merge + handler moved to MainService