[fix] merge conflicts