Changes on user_2048 and is_valid_name test
Merging conflicts