added unit test for LifoConflictResolver