featureA stuff
more featureA
After merge