Making it work after merge