create merge confilct with test2