Improved matches and added one for merge conflicts.