addons page
resolved conflicts