Fixed sweet merge conflict issue