Fix package conflicts