Tried to resolve merge conflicts, don't blame it on me...