resolved conflict merge and linted