redid the merge now should be ok