tests for reprs
merge resolution