Merge "Fix messed up current.txt"