some notes on preventing addon package merge conflicts