continued resolving Jun's edits