Required commit
Conflicts resolved