updated my merge