testing mixed commit