When you merge with master, there's going to be a conflict here. You're going to want to keep the code from master in, since it does some validation on the input fields.

Below all of that validation is the comment you removed (the `// create the Entry object to add to the Budget` comment), so you're going to want to put the fix down there probably.

So what I'd do is merge master into this branch (with `git merge master` while in your branch) and fix the problems. Then push up your changes so we can make sure they look good, and then I'll OK the pull request since it looks good.