commit before pulling
fixed merge conflict