commit before pulling
fixed merge conflicts