#4a commit 1
#4a commit 2
modified conflict from a
#4a commit 3
Merge branch 'feature/#4a' into develop

merge from a