forgot to commit some old notes
resolve notes conflict