commit before pull
using theirs