merged master's lib dir