MOOAAAR FIXES FOR FAILED MERGE!