fixing some merge conflict issue