Solved the uploading issues
Conflicts included