updated proje from merge