fixing merge and removes toString implementation