add trailing slash
fix merge conflict