Conflicts resolved from previous commit