thurs notes
thurs
resolving conflicts
resolving conflicts