push missing files to fix build
resolve conflict