Refactor inception merge