Fix merge.feature as well