Hopefully fixed the last merge problems