finish merge cleanup