Removing conflict issue