clean up branch before merge