before pull
conflicts fixed