removing conflict markers
removing conflict markers