FIXED MY MERGING YEAH