Merging to use IntelliJ instead of Eclipse