Remove useless build files
Fix conflict