Resolved a conflict on milestone report