develop merge side effects fixed