Added missing _ include
ignore more stuff
fixed merge conflicts
single quotes ftw
fixed merge conflicts