Added some text to alpha.txt.
Resolved conflict with alpha.txt.