FIXED MERG

THIS IS EXHAUSTING