conflicts in importnotes resolve