removed extra } created by conflict