Fixed Conflicts, some bugs

lockhart wtf