merge mess cleanup