generator merge fuckup fixed