Added fixes for merger