Deleted Null Class
Deleted lines
Fixed CONFLICTS