things have started working, but some conflicts are being duplicated.