[fixes]
- fixing the decker file, i messed up the merge conflicts