notes to branch files and avoid conflicts. please see the file everybody
minor
added more explanations about patching