Maybe just in time to create a merge conflict as Feature3 gets merged
(sorry!)...