cleaning
fix conflict
got it working