fixed the conflicts, now all working