fix conflicts, fix name