used the version without conflicts