resolver comflito