Removed weird merge stuff