Resolve conflict for complete_CTRL-E
clean up