Fix 1 and fix two in concert do this better thing
Fix 4
Fix A
Fix B
Fix C
Fix D
Fix E
fixup! Fix C
This is Karen squash! Fix D
master 1
master 2
master 3
feature 1
(cherry picked from commit d4e41364139760a55ad69f896241e07b7ca6e09c)

Conflicts:
	fix.txt