from your description is sounds like one of the commits in master has
changes that are undoing your changes in iss454.
Your best bet is to try and track down that commit(s) I would look at
the history of the file(s) in question via
git log --oneline --no-merges -- <path to your file>
gitk <path to your file>
The look through those commits until you start to see how the changes