Trying to remove conflict