added notes for syntax coloring
fixed merge shit