removed weird merge thing