create organization model and add logo upload
fix conflict