merge changes, added settings