cleaning up old conflicts