merge development.ini