The Merging of CVS changes do not work. When I have conflicts, and I click on the Merge button, the result between the Local changes and the Changes from server result into something which is not understandable from my perspective. Eg, I have two lines of code (see screenshot) which cause a conflict. The first line of code is: public class IltSessieVO extends AbstractVO { while the second line is: public class IltSessieVO extends AbstractVO { (they are the same). The merge result however end's up in this: public class IltSessieVO extends AbstractVO implements Serializable { The Serializable part comes from the server part, it's not in my local version. The Merge screen however doesn't show this! So I have no idea on what I'm currently merging, where the merge result comes from, etc. It appears to me IntelliJ is 'inventing' some code (e.g. the Serializable part) or is merging a different file from the one shown.