before pull
resolve conflicts
freinds block +save user on db + rolldown panel