merge errors it seems