Trying to merge my temp branch with rewrite