fin premiere phase
fix unpulled modifications