fixing merge and clean data