GetUser in ModelFactory implimented
Merge conflict fixed