Fix merge conflicts D: