commit before pull
merge