finalilze merge :-/