whoops, finished fixing the conflicts