Added OpenIDE config
Fixed merge issues
Shot in the blind