before pull
merge conficts
merge conficts