add fuchsia ard plugin support, add temp and intellij files into gitignore
removing reference for type bundle that does not reference the right bundle
conflict resolution