Apperently I have unmerged files