If no one has ever changed the file other than you did, then merging will directly update the master branch with your commit