rm build files
fix merge from codebase