Misc: Fixed My Merge Conflicts Before

Signed-off-by: AriDEV <aridev666@gmail.com>