removed weird merge stuff