Fixed build errors caused by merge cruft