ignore intellij idea files and resolve conflict
renamed a constant
merge minor changes
simplified method declarations
refactored raw path building
clean up some code
fix off by one errors
clean method signature