merge develop with branch