Removed garbage from merge