Fixed all conflicts with commits and User API.