(feat) Fixed merge conflicts