fix for syntax error induced when resolving merge conflicts