flashing kinda
merge conflict