Thanks. I have fixed it using functor. But when I try to commit the change to my branch, it keeps saying "git did not exit cleanly (exit code 1)".