master bug fixed
resolve merge complete