trying to fix the precompile issue
fix conflicts