hopefully not-buggy user stuff
fixes merge conflict