Add static notes
Fix merge conflicts
Solve merge conflicts