a few changes
fixed merge conflict, I hope