Merged conflicting commits