Fixed replace and conflicts