[fix] frontend merge conflict with yash's machine