Conflict

Huge part of code was doubled due to that conflict, deleted that
doubled part