Fixes another Merge Conflict