Fixes destroyed lines because of conflict and adapts tests.