EDIT: Fixed minor merge-based errors
EDIT: Fixed minor merge-based errors