Fix additional merge errors