You can merge master into the test first so that if there are any conflicts, you can resolve them in the test branch itself and the master remains clean.
(on branch development)$ git merge master
(resolve any merge conflicts if there are any)
git checkout master
git merge development (there won't be any conflicts now)