Fixing Lucas bad merge