Fix linked conflicts