retrieve .settings and recommit
merge