map: unite git/conflict
fix sbt parser
force sbt ftdetect