Might I make a suggestion. Can you wrap your functions with the ability to check if a functions exists? function_exists(‘functionname’)
I tweaked the password form a little and had to comment out the entire function pixelwars_theme_password_form() in the parent theme functions.php. Now I have to remember every time the theme is upgraded.