Fixing merge problems from basic-template