Note .equals method
merge conficts