New adapter settings
Attempt fix of conflicts

Fix conflicts