Resolved conflicts, updated mock data
Merged diffs