Remove conflict

There was a conflict during a merge, this pr resolves said conflict.