fixing trailing slash #314
fixing merge conflict