Merge handled wrong. Files fixed.