fix settings merge