Fix conflicts, fix name