report progress
fixing merge conflit