text highlighting
urldecoding
fix merge conflict