Add Neat framerwork
Fix conflict