testing push without pull
resolve conflicts