Fixing merge (missing lib files)