Remove old library that was added through the merge
Merged from branch
create directory to merge into trunk
Merged with trunk