Fixed the Conflict