A few local changes
Fixed merge conflict