Improved conflict handling: local and remote added file are merged, if equal