fixed weird merge stuff