removing syntax error from merge conflict earlier