fixed fucked merges