Resolving merge conflict and linting new changes