removed Attribute local ID check
merged conflict in integritychecker
fixed conflict