started to clean the mass of merge