commit before pull
resolve conflict