removed bad merge token