Fixed conflicts with other version