intellij profile changes
workspace conflict resolved