change commit before pull
Conflicts resolved