Fix package conflict