Adding changes to check assertion objects on the right side
Fixing Merge Conflict