fix issues related to previous conflict