merge patch 1,3