Fixed some more conflicts