Fix merge commit