Added Import and Fixed Deprecation and Other Warnings
Fixed Conflict