fixed more errors due to confliction