commit before pull
kinda merge