before pull
correcting conflict
incremental dev update