(Hopefully) Fixed the conflicts