Include files lost in the merge