First commit with mock user recommendation service
Merge conflict resolution