Fixed conflict and fatal bugs.