Removed conflicts in loader.py