@byteit101 Fix merging issues with you comments