before pull
conflicts resolved