create merge confilct for testing