git test
delete test file and add image preload test file
resolve conflict files