syntax error from prev merge fixing