Re-add code from merge conflict hell