resolving two conflicts from previous commit..