install addon
merge conflicts
locations