p2: rm core/syntax.y merge leftover