Fixes merge problems with last commit