Feature X
Master modification
Merge branch 'master' into featureX
aha
another commit