be sure to clean branch-6-4 on server