Removed possible conflictions