package conflict fix