add bundle files
fix conflic