add tuning notes
merge conflict resolution