[warning]tried to fix merge bugs. still not compiling