fixed merged things