simplified endturn
merge