Added files ignored by the merge