Fixed the rest of the conflicts... Thanks Alex :D