Bug: clean some conflict