My Tidier Feature: No Merge Commit