Smelly validity test
Conflict merge