patch approach
fixing merge