quick conflict issue fixed