big bad commit
fixed some merge thing