Git command to merge development branch with master branch added