Completing equality
Fixed merge conflicts