Fix previous commit with merge errors