data now persists
reports now persist
removed files causing merge conflict
merged with branch