Fixed partials
Fix unmerged files