fixed all bugs
CONFLICT RESOLVED