Fix merge confict