Delete library metadata and project files
Fix merge conflicts