change name of Reverse 2048 to 'One'
delete backup file
Fixed Conflicts