Added missing file removed in a conflict