Undoing of stupid merge problem