Fix merge confilcts