cleanup of conflict aftermath and one test addition