fixed weird merge problem