Fixed/implemented starred match functionality
Resolved conflicts