Overrides appearing after merge

My team and I went through our library and reset fill and stroke overrides that were not supposed to be there. (We are making a wireframe theme library from a dark theme library). Once the file was merged some of the fill and stroke overrides reappeared. Wondering if anyone else has had this issue?