File conflict when upgrading package