Fixed minor merge errors

This version compiles