add Java style indent
missing if close
correct npm command checking
solve the conflict