making stupid changes
trying to resolve the conflict