commit before pull
merge
fix merge
last commit aM oct 22