added myself to the directory
merged changes