[rename] [fix] merge related fixes