commit from home
resolve merge