Resolve merge and add a comment and type sig