add to It fro search
merged conflicts