removendo _site/
Fix unmerged files