FIXES ALL THE MERGEZ