pulling
resolve conflicts