https://github.com/consulo/consulo/wiki/Merging-from-IntelliJ-IDEA.-Aspects