Imported into main project and fixed conflicts
No idea