forgot '1;' while resolving conflicts