erased mrig's commented out merge conflicts -.-