fixing Conflic Galaxy Form