merje devel to master