Added validation
resolved conflict