INTERNAL fixing merge corruption in project intellij config