Fixed lint and merge errors