To limit conflicts

• Pull Master
• branch from master
• work on your feature
• commit on you feature
• make a pull request

if you want features that are on master you can merge master into your feature branch