remove merg conflicts
remove span