Fixed issues with conflicts