Error handling on repository Update
Change merge strategy to Normal