remove conflicted
A lot of things