Editing file in feature3
Fixing conflicts when merging feature3 into master