I got a lot of conflicts on the merge, so I copied my original code and manually did the code formats.  May have accidentally added an extra line.