deleted giberish from merge