Reverted to an older commit.
Fixed conflict for IssueDifference and UserService