Merging with changes from wick-ed