Updates regexp for showing conflicts