working after merges (took newest manually, git failed again)