Update package
Update and fix conflict