merge with current durandal