Fix merge errors manually