[todo] merge