When I update my code and there are no conflicts