Prevent double-entries and weird mergings