added settings merge