deleted conflict errors in home page

Please check