added a nice line of code
merged files