Improved conflict handling: local and remote added file are merged, if equal
Merge branch 'rc/2.0.0' into develop