Solved conficts.