FUCKING MERGE, FIXED