remove public/assets
fix merge conflict
connected to lms database