Fixing bad merge: duplicated bean