merge preferences into develop